Updated for validation