More tweaking on metric table