Update Model & Singleton traits