Improved schema entity loading

Now loading from the base schema works