Refactored entity placement on creation