Adding support for feedback and other direct and indirect metrics