Add support for request tracker