Fix Plugin DataAccess