Added to controller
removed option types from controller