Added more variable settings