Added integer suffixes

Change-Id: Icc77670ed248dbbf0552476aa167e368a1deff00