Removed email optional