DB Structure fix