replacing raw types by parameterised ones