Refit to latest framework improvements