Adding adopt stack support