WIP supercommand added more stubbing features