Changes for assign interface