Fixed indentation style (2 spaces)
Added map handlers and tests