Entity creation and location fixed