Moved to mixins and made variable default