Converted util classes to mixins