Added some additional variables (as an option) per request by SektaNZ