Adding metrics query back (#91)