Final versions of the openaire plugin with some messy bits removed