Added back db tracking