Continued modifying to ECS architecture