Add support for keypaths