For #81 did some refactoring to remove some references to ODataPropertyContent