[OEM-224] refactoring and enhancements requested by Ratna