Updated framework and cms