Feature/zpl enhancements