Removed immediate validation.