Adding props and data for better components