Updated framework and structure