I think the first one is at the protocol layer. For the second I’m guessing its something that would be tied to the npub so updating that nip to support this additional metadata could help.