Include missing changes from GUI