Email clarification and DB changes