adding decorator-id property to instancer
cleanup decorator-id property