Add more schema
Rest of schema files