More dynamic elements - refs BT#7154