Better structure to keep adding new languages