Some changes to prepare for OEM