Added multi-variable support