Map properties design improvement