Entitlement/subscriptionBase changes to address the following issues:
fix ###67
fix ###48
fix ###6