Added skipOEM flag for state