DO NOT MERGE: Fixing Entities

Not done yet. For stuff like OperatingSystem familier