Added inlining support