Updated constructor to not create single assignemnts