Added support for database index