Adding support for styles