Added full language support