Added routing components and expression integration.