fixed ingestion related models and added ingestion.py changes