Updated interfaces to latest changes within spec.