Refactored Entity component storage to use Map collection;