Some framework improvements