1. Update VirtuosoHandler (db elements)
2. Minor changes at metrics