Added a new Options class as a mixin