Updating Data classes
Cleaning up "sample" code in Site