add YAMPST support