Updated with latest Fabric spec.