Yups... that's right any additional dead load besides the selfweight needs to be separated to prevent double calculating of selfweight in mass source. Additional dead load which known as superimposed load should be added when third option of mass source is used with load factor 1 and life load should be added with load factor according to the spesific code (Usually 0.3).
CMIIW,
regards
CMIIW,
regards