Updates to song structure classes.