Fixed indentation
Replace id with a relation id
Remove multiple model per file