Model extension for #1710