Revert "Removed definitions from the controller"

This reverts commit cfe8423dca60ddae8205cc2a72506508c815e10b.