Added variables checking