Added missing validation