Resolved issues and updated MapHandler