Refactoring, added Shader stub