Tested zip2 and added fromFlat with default
Streamlined builder once more