CMK - update and add context helpers
CMK - update