Improved static map