Make components optional