Added support for shaders