Better Agent normalization