Improved CSS support