Fixed DB singleton structure