refactored new django master to use the new fields API