Small modifications to user class