Catalog extended with ability to get both data and headers