jiraId:MAR-542 refactor