Class User tweaks