Added back entity_component_masks