Implemented OrderedMap
Introduced OrderedMap
Improved permission handling of controllers
Adjusted TODO