Added schema checking