Adding Choir support.