Issue #160 - Finalize backend