Make locale optional