Tested with mox
Updated documentation