Added improved overwrite logic to Language class