Added blocks
DB usage refactoring