Updated table and user object class