[#70546388] refactored holding class