Elements rework and last framework items