Add scenario selector
Handle more argument types