Additional work on Xfinity client