Adding support for optional stroke