Issue #1: Updated references