Update code to use new classes