Added more functionality to assignments