Use better map