ECS Legacy Solution