Bundle-Cat fixed & Restrictions check implemented