Adding devMode support