Email is now a separate entity