Fixes, added funtionality to map handler