Version 0.0.0.9 db refactor