Adding submodules for dbi and common