Renamed tree properties and added 'data' to node