Adding service:tags, services and services:catalog.