Refactor Language support. Thanks Ecconia!
