Improved Lang class for easier extendability