Make it optional, but default