moving options to model namespace