Store entity collections seperate from systems. This allows for future planned feautures. Arrival and departure hooks got removed in the process. They will be reimplemented in case any use case is found