Added custom css class support