add further classes and adapt existing ones