Some Improvements for WFSMapControl