Improved performance, made "active" class work and introduced manual ordering of languages