Improve language support. Remove deprecated methods. Fixes