Address: Added keypath refs.