Fixed OOP cross-package pollution