* Some DB refactor
* Some more validations/questions  enhancements