Correct metric expressions
Refactor database setup
New packaging and metrics deps