Add in goo.im support