Fixed Entity so it will add entity type on every creation