framework improvements