Up to9.3.4 Partial refactoring