Added support with initial controller