Re-add validate