More changes to DB structure
Merge branch 'master' of https://github.com/ecocache/ecocache
Merge branch 'master' of https://github.com/ecocache/ecocache
Merge branch 'master' of https://github.com/ecocache/ecocache