Merged old version with loops changes
Added empty construptor & compatibility for ZAP UI