Revised config and dependencies.