Adding indexing and custom fields