Extracted PropertyPath into its own file