Code Refactoring, minor architectures changes, Features 66, 73, 67, 74