Added module metrics to the core