Added initial set of classes