Added tracking for assignments