fix to use class from configuration, instead of hard-coded class ( #73 )