Removed unnecessary units inheritance. Added rebuildIndexes to db service.