Adding fabric completion and reordering sourcing completion scripts