refactoring for io.fabric8