Small refactoring
Added mail and user support