changed: all sample scenarios now use extracted datatypes