Split in classes to add tests later