Add additional metrics

Collect additional metrics from the database. Not sure if there are more worthwhile things we can get from the database.

A concern is that those SELECT count(*) queries might be a bit heavy on the database.