Better get_fields class resolution