Enhance input
Add departments module
Merge from branch deps