Added repeat and spacer units