Decouple Language dependencies