Take care of code base difference