Make run method more usable