Changed trigger class to DvFex, propagated changes and some cleaning