Framework code design is changed