Updated with latest objectolgoy and subscription-manager changes