Adding map legend
Adding validation for type definitions