Changed listener stucture in controllers