Added support for uniforms and basic math classes