Refactor methods to make it quack like an AR

[#69540480]