Added autmoted assignment addition feature