(+) Add: Improved validation of maps