Work on Entity Component architecture