Added index for database and models