Added schema and generation stuff