add support for toy builders

Change-Id: I5a375a856278923b8af2f5b6ef6180a2a24cc1bb