made changes to work with devtools loader and GCLI api changes