Add components and helpers