Added keypath support