Added extra validator