Removed indexing for a handful of properties