Multiple changes in ECS

- Added override to storage implementations.
- Cleanup in the immutable storage.