Basic classes have been added