Updated to support the latest Fabric client.