Add user class and simple updates