Better modeling of unit entities