Updated framework components