Updated variable checks