Added Nimrod support