Add Commercial Base rate support

Fixes #60