added option to map only native or only custom properties