Update framework and documentation