switch to indexed models
Merge branch 'import-models'