Huge code base update