Adding current WSDL, added more validation and errors