Added more options to the configuration