[FEATURE] Services personalization + refactoring