Update mail to fit coreObjectSpec interface