Additional changed after code validator