Use dynamic mappings
Added proper ignores