Added missing couple of classes