Added support for custom CSS classes