Refined @context and values