Support insertables with numbers in the end

Change-Id: Ic339bd2db56b510f74ebf2858edd18f2a6a4af62