Added language attribute support