Adding goodle support