Better field groups handling