Reintroduced validation