Improved support for washer variants