Fixes Issue #23: Use namespace keys for increment and decrement