DB stuf
Fixed circular reference