Added new class to move all the utility into it.