Make adding and substracting more flexible