Fill up StorageUnit and DisplayUnit definitions

This fix is to make the spec look like more complete. Not ready for review since it is not started.