Updated related fields