Added additional base cases.