Refactor: added helper clas