I think it's a problem we can solve next CMS version when we do it composer-style.