New Mappings for NIO, DCMS and Query String Support

@psd to review