DO NOT MERGE: Fixing Entities

Better to check if it is a string or a class object, if the second then will do not need to deal with `importlib`.