Updates to fabric version 2