db infra structure  fixes