Add Assignment Rules
Update parser