Updated framework and documentation