Add modular mode, fix list processing
0.0.12