Remove nested aggregated and modified metrics path
Added postgres as default database if not specified