Issue #2: Reusability improvements for previous commit