Compatibility with new custom models