Update code to work with knox 0.8.x