Adding option to add a Map of custom properties