Dependency added + Some small improvements on Composite and ECS