Changed some options to be static.