Add more support to OOP metrics introduction
Add moar metric sources and notes