Oops! Missed these new classes with the previous commit. Sorry!