Changed entity loading and creating