Add goo support