Add template for complex types

Change-Id: I2083676c2bab78a72101da935aeb355abfee32b8