Adding helpers

Change-Id: I731f7d156c55bafc1db19104c69611c3475d98e2