Support type inference for SCPD
Rebuilt collections