Added full addition support.