Update assigment rules
Refactoring