Change declarative to programmatic tracking