MCCode modifications