Yeah COSMIC will resolve this kind of issue once and for all. The current setup is very dependent on a person not tampering with expected features and packages.