First commit with Class generator for query type APIs