Add more components and values