Add keypath import support
Update comment