Faster database edits as discussed in #12