Adding typed collection mapping
Adding typed feature collection mapping