Fixed database implementation