moved map into entitySys