Added json marshal tags to User struct