Add Special Master & Refactor CodeName