Switched to using prepend, instead of include, for UnitsMixin