Refactoring: impl package, HandleBase, StatBase removed