refactored map keys
small refact of systems