Added new structure to previous classes.