Added and integrated Chorus and Verse components