Make entity builder fully functional except unforeseen bugs. Refactor most of entity builder and various functions in the loaders and entities.