Added codename and mask