Extension added to building by old queen upset former partner (6)

I believe the answer is:
annexe
'extension' is the definition.
(synonyms)
'by old queen upset former partner' is the wordplay.
'by' is a charade indicator (letters next to each other).
'old queen' becomes 'Anne' (Queen Anne, 18th-century queen).
'upset' says the letters should be written in reverse.
'former partner' becomes 'ex' (an ex-partner).
'ex' backwards is 'xe'.
'anne' next to 'xe' is 'ANNEXE'.
'added to building' is the link.
I am not very happy about this link. Some or all of it may belong to another bit of the clue.
Can you help me to learn more?
(Other definitions for annexe that I've seen before include "Building attached to a larger one" , "Wing - extension" , "Building attached to a largerone" , "Added section of document" , "Building joined to a larger one" .)
