Added support for 'stem' and 'extension'