Better add behavior