Adding proper inline api handling

Change-Id: Iaa8e92f26ff70f203e349ef985db9cd9f5e5c4b4