Bind type insertion
Complete missing type insertion

This is rather messy but it does the job pretty well.