clone method fix and fix toJSON method for new models