Map update 4.4.1.0607

Optimizations. Covering exceptions.