Added indexing for Postgres