Updated interfaces for new framework version.