better logic for including mixins