Added assumptions on variable units