Framework refinement

Framework refinement