Adding devmodules support