Updates to Classes