new keep attributes map support