Improve Nimrod support