Extend features and minor language support