Added full hierarchy to block matching framework
Added coloring for MVs