Add support for tags and single object returns