Made controller manager more unique minded