Introduced some basic instrumentation for leaf components.