Should we use constructCallbackUrl here?