data.Helpers classes moved