Imeplemented oo-diagnostics

Change-Id: I309cc805d4b21c3eb777844b146fbe456abfe6d3