This feature serves as a preparatory step for #381 