Made email optional