Added custom class