Trying to add gdata support