Move .extra to .user, other updates.