Add metadata and search methods