Create new FieldTracker that works well with foreign keys

This will fix the issue mentioned in #43.