added more helper mixins and classes