Added code support to two validators