Add advanced options, VCS check, debug email