Added missing fields