Add User.current and removed User.build