Fix e refactor plugin OCCI