Porting from 6.x to 7.x