Further buildout of NIO implementation