Improved NimManager