Create controller definitions class
Merge branch