Added controller generator