Added variables handling in sample steps