Added some inter module dependencies