@sjaak @rdubner Not sure if they were always static before, if there isn't a reason to make those static I'd suggest to stay with those classes in object scope