Added missing modules and packages
Added extra validation for restrictions