Update legacy code part