MDL-35870 further abstraction