Added more user-definable options.