--Fixed module dependencies to allow parallel build