[COOK-2644] Extend variables

http://tickets.opscode.com/browse/COOK-2644