Fix save model && enchance entity extend method