add xml classes
removed base class