Removed hard coding of language