Further reduce map size