Improved trace functionality: logic carried out to stand-alone member