Updated validate methods