Improved API for Uniforms