Added initial classes