So how about I restore the public interface and forward to Dispatcher but deprecate the forwarding methods?