Replace all model and fix some bug