Create separated sender class and improve configuration