Updated to latest Fabric spec.