Added assignment_id as field in data controller