Add restrictions in system states