Framework rework