Single responsability added from SOLID principles