Adding map validation