moved to db-namespace