updating classes

completing classes definition.