Refactoring to simplify Enumerations and adding of new Technologies.