Add EntityType to Entity
Fix bug on first movement