reworked Fabric8 tooling