Changes to support multiple contexts (NCIP/caBIG)