Added custom class support to elements