This will require changing but we can do that with a separate PR I guess.