Fixes types in shared controller.
Migrates map to new controller architecture.