New call pattern.
Fix dependencies.