Various Plugin updates to SQL and DataFile