Phone number support during registration + Fixing emailing bug + Refactoring models