Updated controllers and options to use base