Added stack-list support