Added aMap and cMap to StrategyContextManager
Reorganized MessageDefinitions