Added support for top-down composition