DAR-2719 | Changes after code review