Update framework
Refactor