Additional classes and details refined