Modify user self class logic and class scripts