Added Uniform variable support