Added schema and added testcases