Code clean
Support null model version