Switch to fentry and add dep watching