New Mappings for NIO 404 resolve, and minor mappings