Circular dependency solved. Entities now actually move in Map