Refactored mixins