parameterized instance definitions

Change-Id: I54236ff930c9546275973da33250296c85101a28