Moved more parameters into our properties files to make them save-able.