Refactor/callback url