Added support for callback URLs