Started working on schema generation