Improved the FabricService and fixed some issues. Renamed classes.