Techonologies refactoring