data scheme support enhancements, base64 encoding support
adapt to net changes in other modules and fix tests