Add email field and remove title field