Change datamodel for path to include final path key