I think we should follow the same injection pattern (like in leek PR)