Continue big refactoring