[TASK] Keep the changes to PackageStates.php low