Added custom class mapping