Add more fabric overrides