Add relevant prefixes only