Updates to model for indexing