Added contact and email logic