Added email and additional functionality