Tweak support to include dependencies.