Added user info properties. More code clean up.