Renamed some properties to avoid so many case statements.