Builds on improving domain list - adds support for compound components