Client framework improvements