Added indexes on object model