A couple of classes repackaged