Finished up refactor of EntityLoader