Moved system-of-record message validators in