Added support for @inrouteCaller and @inrouteContainer