Draft update of classes