Refactor google universal module