Master Code and Master Code MVP changes