change namespace and to complete the base model, not completed