Change indexing method cause Django is buggy here
Add new models