Making Stroke-class much more flexible