Some improvements for Map and Date results