Issue #147 - Updates to integrate with PR #132