Updated metrics. Fixed spout import paths