Pushed more common stuff up into CommonBase class