Add support for Requests and Comments