Data model is now good enough for feed import