Change to use json for User