Updated to use base controller