Add NoCaptcha Support and other refactoring