Updated helpers classes according to code review