Added missing field groups