This is API breaking. We need to discuss this.