moved common data to DataAll and updated references