added support for ANZU along with some fixes