Move options to mixin