Added updated restriction entities
Updated form
Restriction fixes