Updated to support libPOLY changes