Modern Fabrication support

Support for newer versions of Fabrication