Improved EntityLoader