Refactored User extension