More changes based on Base Model user info