Brought base template in line with mc-core.