More updates to refactoring of internals.