Should now support custom models safely without breaking older versions