Updates to class