BZ968 Add ContextList implementation