More refactoring - next version to delete all old impl.