Made proxy fields generic