Added contexts to add callback