Improved durability handling
Fixed double message
Work on issue #55