Fixed Loader. Added Entity parent object for entities. Some other fixes