Add contract validation