Add initial assignment setup