Added back missing dependency and module information that was lost during merge conflict