Adding more new wrapper files

Change-Id: Ibeed77ebc1ad0d424d086d4110feb672fab50a9d