Type annotation updates
Class parametric types