Added support for feedback tool