Adding request-reply support