Add getter and make properties private
Adapt to map's privatized properties