- Additional refactorings in NIO extension