fixup! Support optional dependencies