Added back some Shader base classes