Improved object property graph directive