Added metadata and query, starting to do queries