Add basic format and query function
Use new format in buffers