The use of models to conceptualize systems is an important part of the process of building Cyber Physical Systems. While designing such systems, which are in general a multi-disciplinary activity, multiple designers are involved in the design decisions. Those decisions most likely are not captured and eventually forgotten after a period. The Design Framework is a visual modeling tool that aims to help architects and designers to documents the design rationales besides the design artifacts. It also helps them to collaborate to design a system together in a multidisciplinary environment. The Design Framework is at the level of a good prototype, but it is not ready for operational application by end-users in industry. One of the main issues with the Design Framework system is a sub-optimal code structure due to the lack of proper design and development approach. The assignment therefore is to reverse engineer the current design of the Design Framework and to come up with a new design. In order to maintain a system in use, presence of a test framework is necessary. Since the Design Framework is used in a multi-disciplinary environment, an improvement in the multi-user support of the system is also needed. In the first part of this report, the redesign of the Design Framework is discussed. To redesign the Design Frame-work, a number of refactoring techniques are applied. As a result, the code complexity is reduced, therefore the maintenance is increased. The second part of the assignment includes multi-user support and testability. The Design Framework manages the changes to design descriptions and maintains the history of the design artifacts. In this respect, it operates similar to version control systems. In the multi-user part of this report, the version controlling aspect of the Design Framework is described and synchronization of data for multi-user is elaborated. Finally some multi-user features are improved and developed. In the testability part of this report, the test support is described. A set of unit tests and end-to-end tests including the test for multi-user support is implemented. Provided test sets and the approaches used to setup test environment makes the Design Framework more stable and maintainable
