Refactored user and category services