Updated language Support

Reworked a few lines for better language support.