WIP: Fabric support tooling