Moved string resources to ModelDescriptor and added model decorator functionality; tests don't pass