Updated for new framework architecture.