Optional handling of elements in workaround