This will give me the flexibility to change this API. Change-Id: I1ee34986e37fffeb03b8a349f29923541f95b593