Added shading and relocation of dependencies