Fix issues and improvements

Upgrade with R66 2.4.17
Add JSON support
Extend DB model to support upgrade
Fix File and Dir issues