Refactored as per global standards