VE-739 Refactored approach using less method inheritance