Issue #457 - add enhancment