Added TODO for fixing non-command package checks.