Updating classes and structure