adding generic class for mapping