DO NOT MERGE: Fixing Entities

@elyezer has a pont. `self.model` could be either an actual class (which is preferable, actually) or the string name of a class.