decoupled django items and model, added source field