More props factories, see #3418