Update db model and cleaned up the code
Merge branch 'master' of github.com:bveliqi/Catalyzer