Some notes about the latest refactoring