Issue #55: Map features