Previous version did not support Recursive Models