better result class mapping