Added Module support to Controller
0.2.2