Edited/Added classes.