Store version number in manifest
Improve loops parsing