Partially implemented MongoDB conversion
token commit