Added mapping for users