Update implementation based on PR #44 discussion