Point class added, DataContainer changed to PhotoSet