Add refactored db

Add refactored db