Migrate marks and language update