De-couple shim class from calendar classes