Database.add() is now concrete
OMerge branch 'paul-src'