Additional changes after code validator