RH-Support - Fixed refactoring issues