Added more strong-arm variables