* Refactored User managemente code