Added more in setup.pl