Last Modifications for NIO