Update for latest phoenix changes