Move callback_url out from communication block