design changes

Design changes to add class xml