Added entity loading