Move field collection handling to entities instead.