Issue #3: Image handling