Added support for TDA Stack