Add BaseEntity
Fix state set pos