Slightly improved recently added functionality with classes resolve to include Worksheet #SCL-6943 Comment