Added ECS basic impl