Made mixins more subclass-friendly