Remove DB name hardcode