Simplify the Data Model. Remove Path.