Added BASIC and DIGEST support