Added Assignment functionality