Updated framework modules