Upgrade fieldtracker to use directives