Implement dependencies per draft specification. Refactor required.