[dev] refactory to new DB framework