User services module refactored