Units introduction for remaining quantities

Collected changes as the other units are activated in the schema.