Major code refactoring part 11.