Keys and doc update