Update for new common jar