Updated for Mozilla DB