Changes needed due to refactoring of Itchy