Added schema and validation