Added indexing to model