Added option to add custom class