Design improvement on Map Properties