Started preparing for minor implementation details refactoring.