Made some changes to assignment constructor