Added database indexing through DatabaseTools