LOW : fixing modules dependency issues