Added basic language support