Simplified the models that contained a "type" field (initially used enumeration which made things more complicated - now using a plain 'string').