Add type params
Handle type params