### Describe the refactor Refactor the whole ECS class to simplify it and fix bugs. ### Additional context _No response_ ### Pre-submission checklist - [x] I have SET the apropriate label - [x] I have UNSET the issue tag - [x] I have SET the rtype project - [x] I have SET the appropriate milestone