Updated to support BASE64Decoder