Parameterized generic types

Change-Id: Id575311ebe4df1d65de8cbb2eabf8d2b341aa9f7