Add a Captcha facade and refactor