Start adding cross-dependencies for other modules