Added support for full inlining